LWT addition, new fix from colin