Fix #2498