Fix #1416