fixed defs related problem