Comfort fix (40/48)

Comfort fix