Fixes #2260.