Yes, I agree. 
I just saw your patch when I am working on that.
I fail apply your patch directly. 

Can you send me patch or you send out pull request?