Comfort fix (9/48)

Comfort fix