Fix issue 3080