Fix issue #2

This fixes issue #2