fixed toms bug