[GCAD] Fixed bugs.