Address the issue (15/28)

Address the issue