Fix #1298