Fixed the issue and created MR.
Please review.