fixes #15 #16