Definitively resolve spaces issue