align maps consistently across 2.9 and 2.10