Fixes #1485

See the associated issue #1485.