new fix attempt