Fix for Live OC