fix for 2.5