Fix #1490