I don't immediately see why this change is needed --- the comparison below should give the correct result and also without warnings?