LPS-35436-fix