Address the issue (25/28)

Address the issue