* patch from James Morrison (getting rid of broken code)