solv issue#7
update issue#7