build and fix