fix for 4.0