Sorry, something was missing in the previous patch, here is the complete 
one, with a bug number.