Fix #1397