[BUGFIX] Fixed an indexing bug that was incorrectly postfix incrementing