possible fixes for issues #18

Fixes #18