Fixed the return type of the unapply