Fixed loading issue