Fix issue 3076