Refactoring
Fixed an old problem with a vector iterator