Fix pressure valve for more scenarios