Bugfix for issue-402