Fixing reuse of handle resolution