Small error in SafeMap
Revert "Small error in SafeMap"

This reverts commit ffa9bcaf188573454eda6e6249b4a0d971e7d60e.
Merge origin/master
Small error in SafeMap