bug fix CCC-83