Fix #2691