Better fix (8/19)

Better fix