fix bugs for release 1.1