fixes #5 #11