Fix #1451