Fixes #24