fixes #58 #59