Fix #2178