partially fixed but not totally