Fix issue #16

fixes #16