Added check to ensure space after commer.