Code review fix 004