Change for chiba 1 compatibility