Address the issue (4/28)

Address the issue