semi-fix map rendering memory leak