Fix issue 1945