made compatible with 3.0.1