Fixes #15690

Fixes #15690