p2 fixed works without some extra stuff