Rename counter var to i
Maps module fixed