LPS-30439 Parameters are not preserved in some situations