code fixup