Changed tap-toggle to false