Fixed single loop issuses.