Fix bug in callback - set complete=false only if nil