Fix #1007