fixed assembly refs