Address the problem (9/24)

Address the problem