Tom fixes