Fixed offsets caused by the change of maps' grammar