Fixed loading order bug