Fixed the issue#1