Fix bug with `Add button`