the previous commit was actually incomplete, this one fixes #35