resolve-id: proper fix