fixes #46 #44