Fixed partial loading bug