fixed but of extra code