Fixed loading time issue