Address the issue (16/28)

Address the issue