Fix the way PAT is fired for additional types