Added support for more spaces.