P84: Fixed logic.