Fixes #171

Fixes #171