Bugfix for issue-468
Bugfix for issue-469