fix to #24065