Fix for issue 505.
2 files changed