Fix #2682