One more fix to avoid loss of data