resolve bug introduced by changing order of indices in current_p

The reverting of indices, merged in !1930 (merged) seems to have introduced a bug and broken the tests. This should be fixed in the related MR.