Fix for toggle