Added fix for project names with spaces