Fix issue 1.