Fix #1074