namespace resolution fixed