partially fixes #15