Fix Data stop while calling

Change-Id: Idfcd18173f961079da1aa75e35323abec5fddb27