fix for v4.0