Fix for LPS-29049