[[ Bug 13738 ]] AV references not being resolved correctly
Merge pull request #1315 from runrevali/bugfix-13738

[[ Bug 13738 ]] AV references not being resolved correctly