Fix #1287