LPS-35763 S/F fix