fix and build