Fixed close button bug