fix for 4.7