Fix space logic.
Merge branch 'rfrost'