Comfort fix (10/48)

Comfort fix