Proper OC fix 4 all