Map Class Hotfix for devbuild

The way it originally was throws NullReferenceExceptions