Fix "zapping"