Fixes issue #514.