Proposed fix.  Applies on master (b28d44d4226497c4b258).

-- 
Olivier Certner