Fixes #1900.