Much better fix