Made it more resilient to spaces