fixes issue #356