Fixed controller bug while saving