Fixed map drawing bug