Fix for issue 554.
2 files changed