partially fixes #30