Bugfix for issue-403