Fixes #18

Fixes #18