fixed but not good