fixes #71 fully