fixes #92 #102