Fixed toggleEmpty