Fix issue#1(issue#2)