Fix Close Method