Comfort fix (8/48)

Comfort fix