Fixes issue 951.