Fix issue 2