fixed assembly again