Attempt at fixing non-clt install