fixes #66 #67