fixed issues with maps