fixes #16 #19