Fix #1379