Another potential fix