minor fix to return templates