Fixed issue 2

Issue 2 has been fixed