diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml
index 1411a65..c60dd73 100644
--- a/roles/bitbucket_dataset_restore/tasks/main.yml
+++ b/roles/bitbucket_dataset_restore/tasks/main.yml
@@ -52,7 +52,7 @@
     body_format: json
     return_content: yes
   register: import_status
-  until: import_status is defined and import_status.content == 'COMPLETED'
+  until: import_status is defined and import_status.json is defined and import_status.json.state == 'COMPLETED'
   #until: "'COMPLETED' in import_status.content"
   retries: 30
   delay: 10