gustafn
committed
on 27 Nov 22
improve resolution in fallback case