Support OC 1.4