Fix partial loading