Added fix for changed behavior in PS 7.7.1.1