current fixes