Fix to map pages