name resolution fixed