Fix for 4.8