Comfort fix (48/48)

Comfort fix