Fix for 4.6 release