Hopefully final fix for the stupid OEM calculation