Patch for #6602 on develop

Patch for laravel/laravel#6602