Comfort fix (3/48)

Comfort fix