Fix for 2.8