fix ps handlers