Fix a bug found by tests and update baselines