Fixed Completeor crash