Bugfix #440