fixing lose of completed state