Fix #2521

See #2521