fix as philwebb's comments