Fixing space bug