Fix 'convert Option[Product] to catalyst'