Hide/show fields won't work correctly