Another nested ref hotfix

Change-Id: Icff3e7ef40d16806f7071229db2c55cf352010e6