Bug fix for double-quoted templates