fixes #9 fixing #8