Fixing issues attempts