Fix #1258

See #1258