Map perf corrected