completion events fix