Fixes #41