Fix #116

Fixes #116