Fix issue 37.