Fix for the previous commits
Merge pull request #141 from thescouser89/nvr_in_errata_fix

Fix for the previous commits