Repare bug for old versions