fixes #28 #29