Fix Data stop while calling