Fixes #4521

Fixes #4521