Fix #1370