d6a637f
resolve: shorten code a bit (cherry picked from commit d3887b2b484004f6d5b393f57b01fe2eb917981f)