Comfort fix (24/48)

Comfort fix