an attempt to fix 3.0 support