Applied a fix to #49837