Bugfix #742 fixed