Code review fix 003