- committed patch from Richard Smith