Fix...template namespace issue