fixing Issue 3