Bugfix for nil envelope from field