Use this patch, works fine for me.

https://github.com/apache/incubator-.../files#diff-12