CMS-4761 Resolve is not working like it used.