- applied patch from andreas