Bugfix for issue-435