Fix #2096