Fixing the space bug