Fix error, closes GH-7