Correct improper auto iterator usage
WIP 05.03.2014