Fixed issue with data_len during completion