more upgrade for 0.1.7