Patch pushed as a47b4da09945610080ed9f436e8717a3a4c02664 with Maxime's
suggestion.
Thanks.