Fix #1309