fixed bug for 1.1