fixed wrong data defs