fixes #2 #10