Solved a serious bug in the CGT, see #68.