Fixed SafeMap minor bug