CYB-367 - Followed up on code review