Fix some templateUtil to suite and correct what might be a bug !!!???