Fix for laravel upgrade issue