Fixed issue #6

Fixes issue #6