undid broken space-handling, to be handled gracefully