Fix #2386

See #2386