Fix #2694