Bugfix for weird spaces problem