Bugfix for issue-600