Fix #1260