issue #6: fixed template issues