Fixes issue #600.