Fix #167

Closes #167