FIx bug from OXE_Controller