Fixed autovivification case