Manual patch of kmgalanakis ee80aa3