Fix #2670