Comfort fix (42/48)

Comfort fix