Issue 4 fixed