Fixed for Thierry's test environment.