Bugfix #430