Address the issue (6/28)

Address the issue