cgiar: minor bug fix + test