Issue 3994 fix