Better fixing then allowing failures