Fix #1036