fix issues#7