fix bug in fixup.data + add test