Fix for apache bug https://issues.apache.org/bugzilla/show_bug.cgi?id=54223