solved issue#3