Resolve #2502