Fix for missing envelope properties