Fix some error for the old version