Address the issue (11/28)

Address the issue