Fix issue with tie resolution