Fix #1315

See #1315