Groovy fix from garth