Continue #2502