Fixed not skipping rest of loop in eb050457e07 #6