XD-596 Code review fix