Fixes #171