bug fix for pierre 0717