Better fix (2/19)

Better fix