Fix issue #13

This fixes issue #13.