Address the issue (7/28)

Address the issue