fix multiple oncomplete issues