Issue#3 fix

This fixes #3