More tolerant with spaces