Fix issue 3 and 5