Fix for issue-563