Fixed for all cases in the current test data, but I'm sure there are some missing, need to test on more data with different configurations.