Fix #1170