fixing data refs