Cater for Ornagai's inconsistent definitions