fix general bug