Fix for v3.0