Bugfix for issue-375