Fix Map Fixing Crash NPE