Fix #2576