Yeah, sorry, I forgot to pull before creating the patch... I recreated it on top of the current HEAD of the repo and verified that the patch works on my local setup. I hope that this fixes the issue.
This is my first time of contributing via patches and send-email.
Sorry for the inconvenience..

Leo