Fix issue #2

This is a fix for #2