Fixed issue of slow loading