Fix #1025