fixes #5 #4