Issue 2 resolved