Fix 3025

Backport of GH-1300