Close-Button fix 2