Address the issue (8/28)

Address the issue