Fix #1316
Fix #1316