Added forced space delimitation