Remove P and 0 ambiguities