Better fix (7/19)

Better fix