Address the issue (24/28)

Address the issue