Fixes 8557, ambiguous for 8589