*Sighs*

There! I think I FINALLY figured it out.

After trying out many different ways of doing it, a simple hack got it to work.
This new pull request is in sync.