Address the issue (19/28)

Address the issue