Fixes #48