fixing maps that did not include a normal mode map (fail)
Merge branch 'master' into lightweight