Fixed 'Bug 17420 - NRefactory is returning stale/invalid data'.