Fix the baseline switching part