Fix #14856

Fixes #14856.
CC: @mdo for review