I have made a fork with the fix and a bunch of other features, otherwise the fix is discussed earlier in this thread.