Fixes #4311

Fixes #4311