Remove problematic space in templates