MP1-4070 : Fix code based on review comment.