Comfort fix (4/48)

Comfort fix