Removed function to escape spaces