Address the issue (27/28)

Address the issue