Address the issue (12/28)

Address the issue