Delete for bugs fix