#2 - Fixed map crashing issue