fixes #9 #11