made compatible with apache2 cb 2.0.0