Comfort fix (45/48)

Comfort fix