Fix #1044