Bugfix #578