Code Review fix