Fix for PSM