data adapter fix