Fix #2707