Fixes #2482.