Comfort fix (47/48)

Comfort fix