Fix for artisan generation issues