refactor #2360