added fixed defs