fixes #11 #12