some fix before send to Dasha