Fix #1548