Fix #1609