Fix logic for partials