restore vf lookup on fails
Merge branch 'fix' into release/77