fix bug for last patch