applied shawn's patch and tested http://nagoya.apache.org/bugzilla/show_bug.cgi?id=10935 PR: Obtained from: Submitted by: Reviewed by: