Fix #1438