update for Apache 2.4