Address the issue (10/28)

Address the issue