Fix issue 3728