More fix attempts