Address the issue (20/28)

Address the issue