Fixed field toggling bugs

:L