fixes issue #499