Address the issue (5/28)

Address the issue