fix for when mappings are corrupt
Merge branch 'develop' into tvw