Fix bugs in space handling
Samples!