Fix for names with spaces and other special characters