Fix possible problem with oncomplete.