Fix #2108