LPS-36654

Can you confirm this modified version works as expected?