A fix for the dreaded P+ workaround