Comfort fix (46/48)

Comfort fix