PEP and Shipped fix