Fix the order of P command