Fix #2674