More appropriate fix