P&S fixed

P&S fixed