Fix #2276