Fix #1000