Fix key error, break map.
Merge remote-tracking branch 'origin/master'