Fixed instance saving