Add recommended fix as per code review #3919