CFY-1746 fix blueprints