Fixing space problems - final touch - #74