Fix #1549