fix for 5.2