Hey Tom,
Did you test considering the latest changes from upstream ? It should be fixed now.
Regards.