new fixing bugs