Debugging with minimal tests reveals the essence of a failing implementation.

Try this: Isolate the problematic section before rewriting the whole.