fix crash on follow up data
merge crash fix