Fix Claco flow