Fixes issue #485.