Fixes #65 finally