Code review fix 006