Changed current loop vector handling