Fix issue 6