Fix #2251

See #2251