Make maps follow 1-based addressing