fixes issue #409