quickFix to adhere a little more closely to OPT guidelines