Adding in extra guard in PFM