Check to see if this fixes the oppm bug