LPS-32066 Missed more logic