Fixed #6

Fixes issue #6