Fix for apache attachment 2241.