Fix #2502