Yes! I have shared the script that solves the problem.
The trick is to find the wrong indexes during step 1, as the same way as Dr. Bekaert did, but also including 0s in addition to the NaNs.
You can find it here.
Let me know if this also solves the problem for you