- fixes issue #6