fix issuse#7 beta1