fix bug for 1.2