Fixes #2689.