add apache-2.4 compatibility