Fixed PF once more