fixes #741 #742