Try to add fixing for resolveUid, WIP.