Bugfix for issue-497