Fix #2184