patch fix for I-107610 as well