Improved compatibility with Laravel 4.1