Fix #44

Closes #44