fix bugs#2