Bugfix for issue-468