fix current_space bug