ver. 1.7

More bug fix