Major assemble task fix