Fix assemble