This issue was fixed here early August. Rebase and it should work.