Fix #2177