Fixed somewhat bug in the cl