Fix for 2.40