Fix to enable loading