Code review fix 005