Fix #1312