fixed last bug 1.2