fixe issues