Fix for 2.5 release