Fixed Close Bug