Comfort fix (7/48)

Comfort fix