diff --git a/src/flow/lib/models/role.rb b/src/flow/lib/models/role.rb
index 20786127bd..84a65223a3 100644
--- a/src/flow/lib/models/role.rb
+++ b/src/flow/lib/models/role.rb
@@ -319,7 +319,11 @@ module OpenNebula
                 Log.debug LOG_COMP, "Role #{name} : Deleting VM #{vm_id}", @service.id()
 
                 vm = OpenNebula::VirtualMachine.new_with_id(vm_id, @service.client)
-                rc = vm.finalize
+                rc = vm.shutdown(true)
+
+                if OpenNebula.is_error?(rc)
+                    rc = vm.finalize
+                end
 
                 if OpenNebula.is_error?(rc)
                     msg = "Role #{name} : Delete failed for VM #{vm_id}; #{rc.message}"