Fix #2261 and Fix #2272