Fixes #18