rebuild and fix