Fixed g_NextMap issue