Fix to fit data we send