Fixes #1477.