Fixes issue #2424