fixes #740
fixes #740 #874