Better fix (6/19)

Better fix