fixes issue #24507