Fixes #27