Fixed ISSUE 3.