Fixed an issue with having a map key instead of an index