fixes #16 #17