fix for 40.06