Fix issue 1636