Issue 2 solved