Fixes #233