fixing problems with handling override defs