Fix #1475