Comfort fix (12/48)

Comfort fix