Fix to support Client Report