removed previous fix for p2 and added better one