Fixed the reported error and created the MR.
Please review.