Address the issue (17/28)

Address the issue