Address the issue (13/28)

Address the issue