Fixes #49