Fix issue 1643