Fix for issue#533
2 files changed