Fix #2088