Fix #1081