Fix #1169