Fix to avoid empty partials error