minor changed to remove unresolved name