Fix #1103, #1101