Sorry for spamming the list.
I  did some things wrong when trying to fix the patch. 
I am not familiar with the email-based workflow and I don't know how to delete those embarrassing mistakes. 

This patch should be the latest change.