Fix #1079