Resolve over saving performance issue