Fixes #105

Fixes #105