added support to C* 1.2 series