(hopefully) fix for PSM-280