fixup after moving code