fixed unapply multiple fields