Comfort fix (32/48)

Comfort fix