diff --git a/lib/Slic3r/Print/Object.pm b/lib/Slic3r/Print/Object.pm
index 1e0217c7..55703d72 100644
--- a/lib/Slic3r/Print/Object.pm
+++ b/lib/Slic3r/Print/Object.pm
@@ -1005,8 +1005,8 @@ sub combine_infill {
 sub generate_support_material {
     my $self = shift;
     
-    # TODO: make this method idempotent by removing all support layers
-    # before checking whether we need to generate support or not
+    $self->clear_support_layers;
+    
     return unless ($self->config->support_material || $self->config->raft_layers > 0)
         && scalar(@{$self->layers}) >= 2;