rebuild and fixup