Fix issue 3933