Comfort fix (6/48)

Comfort fix