fix .then
fix .thenWithData