Fix #2639