v1.1, bug fixed