Fix for code review comment