Fix polymorphic extract if no payload