Fix #1055