fix commit of v1 branch