Fix #1299