Fix for code review