Try to fix map rendering bug