removing second loop. about commit #8731310