Fixes #29