fixes #18
fixes #16 #17