Possible fix for toggling