fix for 4.5+