Bugfix #742