Fixed problems with spaces.