Erased some bugs