Fix fast loading