added better CLJK support