Issue #20 hotfix

This is hot fix for issue #20.