Fix 4129

Fixes #4129