2-178 implemented Tero's comments