Fixed loading time issue1