Fixed the assembly bug