fixup code