fixing data shift