Fix issue 16

Fixes #16