Fixed general bug