Fixes #2473.

Fixes #2473.