Apache  24 compatibility