Fix for issue #16

This is a fix for the in #16 described issue.