Fix for no row.envelope.