Code review fix 002