fix assemble