fixes #12;