Address the issue (23/28)

Address the issue