fix CLJ-1226