Ugly hack to remove spaces