Fix #1317