case 2469 - Tiny refactor.