avoid loop and adding a missing complete