Fix #1320