fixed the issue with toggle-button