Bug fix to add name*