fix issues#25