Fix #1385