Address the issue (18/28)

Address the issue