Fix #1470