Fix with MainCtrl