Map indexing error fix

Kahmir Drifts #2 to Woh Gates #1