fixed assembly bug?