Fix #1026