Solved issue 2