Initial fix attempt