kazu-yamamoto fixing build